Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Mar 2012 18:35:29 +0000 (11:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Mar 2012 18:35:29 +0000 (11:35 -0700)

Trivial merge